Finished last minute fixes