Fixed my bikeshed issues