Issues Fix

Fix #550 #551 #546