Polishing LIMMA and HCL, fixes #426