couple of small fixed submitted by Raoel