fixing namespace problems