Fixed various small things