fix compiler / layout warnings