warrior: some small fixes and optimisations