Minor fishy changes