More package workarounds