Compatibility fixes, etc. Will be more descriptive in next push!