Few small changes to start with