Fixed package declarations