Fixes related to oscar feedback