Compile on Solaris 11 (Solaris 11 zone on SmartOS)

There are a few alignment issues here and below.