Some minor improvments