Another batch of fixes after client's feedback