some Fixes