Small devel fixes

Fixes two problems reported by Johan