few more changes for scala