Fixes for bounce