[Core:] Fixed misc. errors