Fixed known issues #2