Bug fixes for inconsistent standards