Small fixes to enable JADE in the future