Made fixes requested by @robb