#lor - fixes