Fixes for two issues.