Jacks bugfixes