Wrong commit fixes