Again more fixes from bugtracker, thanks to profi-concept