#55: Bug fixes