Fixes for lucid