Fast fixes