Fix build errors, extraneous }