Fixes for 1/2 of stomlinson's feedback