Fixed issues for legacy support