fixes after ga tests