various Fixes