Fixed small crystal issues