Just some Fixes