[IMP] Add improvements suggested by njethwa@cirruscomputing.com