Fixes bugs added by Alex