Fixed initailization problems