Fixing remaining issues