Some proper fixes