Master: Bug fixes