v103 - Small bug fixes

Issues 41 to 44