Pacman fix

Minor fixes to make pacman working.