Restrict more characters (Closes #566)