Several fixes as discussed on the site and issue tracker

:point_down: