Nesstar bugfixing