Fixing some fast-forward issues