minor bug fixes for standards compliance