"Fixed errors to work with default package"