Final fix for loader and removed debug