Charstash fixes