Bunch of fixes for existing features.