Fix wrong variable

Signed-off-by: Norv <a.w.norv@gmail.com>
Pedantry.

Signed-off-by: Norv <a.w.norv@gmail.com>
Fix installer after db layer changes.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #447 from norv/cleanups

Bug fixes