Interface and setup fixes