Pullrequests/bug fixes