Some bug fixes and small improvements