Fixes for handling core John. Closes #17.