Minor ajusments