#482 Various bug fixes