Minor bug fixes
Api defect workaround and minor layout fix