Fixes from dddbbb goo.gl/aFLJZM