quick fixes regarding standard