Some more dummy fixes