Some small fixes to get things working.