Quick fixes
derp -- merge fix