Removed custom package_dirs line
Bug fixes