Post merge fixes
Don't use int in pin

Otherwise 0123456 is gonna fail ...