Version 0.4: fixes