Fixes! :D

Just added some fixes... We need them to make sure the code works... :dancers: