merge a few fixes by sh4rm4