Merged latest fixes from server