Misc changes; cukes still broken