Fixes for lord Gregory