Fixes for the sake of fixes