Minor code issues