Fixing small stuff