fix issues with buttons and types not compiling