Final fix for last few commits