Bug fixes

Thanks to @DavidHaitch for this update!