2 Fixes for last update