diverse fixes, see https://trello.com/c/alMV9oQ1