Fixed problems reported by manos