Fixes for missing commits