fixes for the good