commiting missed fixes