Bugfixes for issue reported here: http://bit.ly/ZMwqla + namespacing for status constants