Fixes for the last fix