Functionality fixes