Minor changes to get rid of errors