Fixed a few separation bugs