Fixes for stupidity.