Feeback fixes