Fixes for stupidity