Even more small fixes