Fixes after first package check