Fixed inventory population issues. Fixes #17