Various fixed as per pull comments