[March 21st & 22nd] Hotfix #2 and #3