Fixed deprecation warning + some stability updates (images w/strange chars in filenames etc.)