Fixed proc issues