Some changes / fixes