Minor small fixes