Issues #186, #187, #188 and #189