Small issue fixes