Some smaller improvments