#106 #107 & #111 Fixes

Fixes for the above issues.