Fixing the new Jade issues