Fixes for stuffs