Fixes for Silver