Small improvements/fixes