Small fixes

Small fixes based on feedback by Arjen.