Fixes for my two issues