Fixed rbx bugs