Final commit fixes