Fix build

Some files were reverted to its original state, some just fixed