Styles fix, jni fix