Fixes from jon