Some small tweaks, because #YOLO