* More small fixes not meant to make it to the dev branch.