Barbican setup fixes