Crushed most of the bugs causing failed compilation