Pull request - few small changes