Bug fixes because of separated class library