Bug fixes two