Fixed code loading methods