Finished fixing project, fix new warnings