Baseplate fixes