Random fixes after igors advice