Minor fixes and warning suppression