More Fixes for my new Functions...