Fix issues with remote