#4

Minor fixes