Post commit fixes