Fix  various type errors
Remove break after return
Bump Mac-specific for type fix