Fixes for something else