Added quick fixes