Committing fixes from previous fuck up