Fixes for you