Did SMC reset and removed bluetooth keyboard and added it back seemed to have done the trick for me.