Little Bugfixes :D