Tweaks, runs fine on JNu