More package declarations to fix