Commit: Fixes for known bugs