Fixes for my changes