FIX: minor bugfixes