Minor fixes
Fixes on squeeze compat