#43 Various patches for merge