diff --git a/dhcp6/options.go b/dhcp6/options.go
index 5c18d19..04eef9d 100644
--- a/dhcp6/options.go
+++ b/dhcp6/options.go
@@ -88,8 +88,8 @@ func UnmarshalOptions(bs []byte) (Options, error) {
 
 // UnmarshalOption de-serializes an Option
 func UnmarshalOption(bs []byte) (*Option, error) {
-	optionLength := uint16(binary.BigEndian.Uint16(bs[2:4]))
-	optionID := uint16(binary.BigEndian.Uint16(bs[0:2]))
+	optionLength := binary.BigEndian.Uint16(bs[2:4])
+	optionID := binary.BigEndian.Uint16(bs[0:2])
 	switch optionID {
 	// parse client_id
 	// parse server_id
@@ -134,8 +134,8 @@ func (o Options) humanReadableIaNa(opt Option) []string {
 
 	iaOptions := opt.Value[12:]
 	for len(iaOptions) > 0 {
-		l := uint16(binary.BigEndian.Uint16(iaOptions[2:4]))
-		id := uint16(binary.BigEndian.Uint16(iaOptions[0:2]))
+		l := binary.BigEndian.Uint16(iaOptions[2:4])
+		id := binary.BigEndian.Uint16(iaOptions[0:2])
 
 		switch id {
 		case OptIaAddr:
@@ -250,7 +250,7 @@ func (o Options) UnmarshalOptionRequestOption() map[uint16]bool {
 
 	value := o[OptOro][0].Value
 	for i := 0; i < int(o[OptOro][0].Length)/2; i++ {
-		ret[uint16(binary.BigEndian.Uint16(value[i*2:(i+1)*2]))] = true
+		ret[binary.BigEndian.Uint16(value[i*2:(i+1)*2])] = true
 	}
 	return ret
 }
diff --git a/pixiecore/boot_configuration.go b/pixiecore/boot_configuration.go
index cd238b6..3a3ccd2 100644
--- a/pixiecore/boot_configuration.go
+++ b/pixiecore/boot_configuration.go
@@ -27,7 +27,7 @@ func MakeStaticBootConfiguration(httpBootURL, ipxeBootURL string, preference uin
 	ret := &StaticBootConfiguration{HTTPBootURL: []byte(httpBootURL), IPxeBootURL: []byte(ipxeBootURL), UsePreference: usePreference}
 	if usePreference {
 		ret.Preference = make([]byte, 1)
-		ret.Preference[0] = byte(preference)
+		ret.Preference[0] = preference
 	}
 	ret.RecursiveDNS = dnsServerAddresses
 	return ret
@@ -74,7 +74,7 @@ func MakeAPIBootConfiguration(url string, timeout time.Duration, preference uint
 	}
 	if usePreference {
 		ret.Preference = make([]byte, 1)
-		ret.Preference[0] = byte(preference)
+		ret.Preference[0] = preference
 	}
 	ret.RecursiveDNS = dnsServerAddresses