Fixes after previous faulty merge