fixes for stuffs