Multiple functions fixes.