Fixes bikeshed issues