Minor funtionality changes