Fixed extern stuff