Fixes for Jarius