Fixes and added some missed files