Some almost bug-fixes