Some Fixes, working again :)