CROSSDATA-202 & CROSSDATA-203 bugs fixed