Various fixes for KLM site