Fixinig namespace problems