Slight client changes