FIxes to merge to compile and run