Fixes and removing static wildcard imports