x!Some bug fixes