Fixed int size issues in officer mdoel