Fix some shit that was broken