Fixed late binding issues