* Small fixes for return values