Various fixes for Lucid and Squeeze