Resolving a few errors