Fixes for bad commits