fixes for errors