Fixes for lucid support #25