Few Bugfixes THX to Hog-Angeloni