Fixes from someone important